Update Visual Studio Build Files

-"Install" the newly-added public gtkpopover.h
-Make the gtk3-demo projects up-to-date

diff --git a/build/win32/vs10/gtk-install.props b/build/win32/vs10/gtk-install.props
index 1db5928e0160da3394a4dd545c5f3b0af9c1aa7b..a621317d0f538ab21cf265bfc16270aa4648f86e 100644 (file)
--- a/build/win32/vs10/gtk-install.props
+++ b/build/win32/vs10/gtk-install.props
@@ -494,6 +494,8 @@ copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

diff --git a/build/win32/vs10/gtk3-demo.vcxproj b/build/win32/vs10/gtk3-demo.vcxproj
index 059469934fb42baefd548984c87973323f828411..fb045c528f89da164903454b2a06a95bd027cebf 100644 (file)
--- a/build/win32/vs10/gtk3-demo.vcxproj
+++ b/build/win32/vs10/gtk3-demo.vcxproj
@@ -182,15 +182,13 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />       
+    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
@@ -199,8 +197,8 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\links.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
@@ -208,6 +206,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\printing.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -216,12 +215,14 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\stack.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
@@ -236,4 +237,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/build/win32/vs10/gtk3-demo.vcxproj.filters b/build/win32/vs10/gtk3-demo.vcxproj.filters
index 8878d9c65cfaa68deabeddb17f97fe3ee3c215ac..903ad30005d7c03efbe5c8d0288de583f405a7b2 100644 (file)
--- a/build/win32/vs10/gtk3-demo.vcxproj.filters
+++ b/build/win32/vs10/gtk3-demo.vcxproj.filters
@@ -24,7 +24,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c"><Filter>Source Files</Filter></ClCompile>
@@ -32,7 +31,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c"><Filter>Source Files</Filter></ClCompile>
@@ -41,8 +39,8 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\links.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c"><Filter>Source Files</Filter></ClCompile>
@@ -50,6 +48,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\printing.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c"><Filter>Source Files</Filter></ClCompile>
@@ -58,11 +57,13 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\stack.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>

diff --git a/build/win32/vs9/gtk-install.vsprops b/build/win32/vs9/gtk-install.vsprops
index 8c16aff5593ebc407f823d5eadb188d6761f4924..6cf80e0b7ad0d9715fd6973be6c2820a291eb0e2 100644 (file)
--- a/build/win32/vs9/gtk-install.vsprops
+++ b/build/win32/vs9/gtk-install.vsprops
@@ -261,6 +261,7 @@ copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
&#x0A
 copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk


diff --git a/build/win32/vs9/gtk3-demo.vcproj b/build/win32/vs9/gtk3-demo.vcproj
index e5abbeaace6149b8e8d88c4dddda2b73a83b119c..a30418ca281a6e4996944a55fde537808dc36f1f 100644 (file)
--- a/build/win32/vs9/gtk3-demo.vcproj
+++ b/build/win32/vs9/gtk3-demo.vcproj
@@ -170,10 +170,9 @@
                        <File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\css_accordion.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\css_basics.c" />
+                       <File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
-                       <File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
-                       <File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -181,7 +180,6 @@
                        <File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\event_axes.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
-                       <File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\headerbar.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
@@ -190,15 +188,16 @@
                        <File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\links.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\listbox.c" />
+                       <File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
-                       <File RelativePath="..\..\..\demos\gtk-demo\main.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
-                       <File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+                       <File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
+                       <File RelativePath="..\..\..\demos\gtk-demo\popover.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\revealer.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -207,12 +206,14 @@
                        <File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\stack.c" />
-                       <File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
+                       <File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\theming_style_classes.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
                        <File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
+                       <File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
+                       <File RelativePath="..\..\..\demos\gtk-demo\main.c" />
                </Filter>
                <Filter
                        Name="Header Files"